From a642c62c57f2f5641d3e947e9aef0177e9ea5f43 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Sep 2004 19:32:13 +0000 Subject: [PATCH] Don't use bitops on booleans. 2004-09-22 Matthias Clasen * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use bitops on booleans. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 4 ++-- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb94b6a397..93c211fde9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-22 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use + bitops on booleans. + Wed Sep 22 00:54:34 2004 Matthias Clasen * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index eb94b6a397..93c211fde9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-09-22 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use + bitops on booleans. + Wed Sep 22 00:54:34 2004 Matthias Clasen * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index eb94b6a397..93c211fde9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-09-22 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use + bitops on booleans. + Wed Sep 22 00:54:34 2004 Matthias Clasen * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index eb94b6a397..93c211fde9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-09-22 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use + bitops on booleans. + Wed Sep 22 00:54:34 2004 Matthias Clasen * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index b743d3359c..58ebb07e0f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1913,8 +1913,8 @@ selection_check_foreach_cb (GtkTreeModel *model, info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter); is_folder = gtk_file_info_get_is_folder (info); - closure->all_folders &= is_folder; - closure->all_files &= !is_folder; + closure->all_folders = closure->all_folders && is_folder; + closure->all_files = closure->all_files && !is_folder; } /* Checks whether the selected items in the file list are all files or all folders */ -- 2.30.2